From 82d38e35f81cd92ffb2365da2ad0c5da3083cbe7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Thu, 27 Oct 2016 09:38:45 +0200 Subject: [PATCH] stack: Use measure() to measure child widget Simpler code this way \o/ --- gtk/gtkstack.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index fb30df8ea7..903657926b 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -2330,20 +2330,7 @@ gtk_stack_measure (GtkCssGadget *gadget, if (gtk_widget_get_visible (child)) { - if (orientation == GTK_ORIENTATION_VERTICAL) - { - if (for_size < 0) - gtk_widget_get_preferred_height (child, &child_min, &child_nat); - else - gtk_widget_get_preferred_height_for_width (child, for_size, &child_min, &child_nat); - } - else - { - if (for_size < 0) - gtk_widget_get_preferred_width (child, &child_min, &child_nat); - else - gtk_widget_get_preferred_width_for_height (child, for_size, &child_min, &child_nat); - } + gtk_widget_measure (child, orientation, for_size, &child_min, &child_nat, NULL, NULL); *minimum = MAX (*minimum, child_min); *natural = MAX (*natural, child_nat); -- 2.30.2